Fix left handside indent from exec output#628
Merged
NeffIsBack merged 3 commits intomainfrom Apr 3, 2025
Merged
Conversation
NeffIsBack
requested review from
Marshall-Hallenbeck,
mpgn and
zblurx
as code owners
Member
Author
|
Also tested the modules which use |
Member
Author
With that we can enforce that only linted PRs are merged into main, so that it doesn't slip through like in #450 |
mpgn
approved these changes
Apr 3, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
When retrieving output from
.execute()the output is first cleaned.rstrip, which correctly removes trailing spaces/indents:NetExec/nxc/protocols/smb.py
Line 811 in 6fcfb8d
However, before logging it to the console the output is
.strip()again, which now also removed leading spaces/indents. This destroys formatting from the powershell output. As we already stripped it with.rstripwe can just remove the duplicate strip (we also don't need that StringIOstuff).Also changed the linting pipeline to trigger on code reviews, so that not linted PRs are pushed to main.
Type of change
How Has This Been Tested?
Against a Windows Server in Goad
Screenshots (if appropriate):
Before&After example of the Command
Get-WindowsFeature, which uses indents to separate categories: